Merge changes from topic "textureview_readback"
am: fc733e1d5e

Change-Id: Ic1308ec895badad285cc90a370de8d844cad4250