Merge "Default generate_operator_out to py2" am: c8483841a7
am: 435b165222

Change-Id: I5e0a331b1a61a690334ed209605ee31cff4b7eef