[automerger skipped] Merge changes from topic "b:140112642:2" into qt-surfaceflinger-dev
am: b38c1e0c -s ours
am skip reason: change_id I7cc05a0b9e8e9b5c3e8d0c4b1d59b0a7dabd43d4 with SHA1 aa61419b is in history
Change-Id: I59855517925528d98cf099af35f0f618f16b317d