Merge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750 am: 20e7d03d7d
am: dbf3538483

Change-Id: I90825e185e8f877684dc3b8a8757e7c2236889bc