Merge changes from topic "synch-opengl" am: 1cae72d096
am: d64eec614f

Change-Id: I97929c707cb520e0b50c05bee5b48a222860eb42