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

Change-Id: I29ce2a3ff71f68620b0f6e0a0fd78bf1bc73fe8a