[automerger skipped] Merge changes from topic "b:140112642:5" into qt-surfaceflinger-dev
am: 04c2e480 -s ours
am skip reason: change_id I4bcdfad65b57782ec6e346e8d884bfb6e2abac4d with SHA1 cdd0f9d8 is in history
Change-Id: I3d07469aa47941d264ac183e2b42dd9640544978