[automerger skipped] Merge changes from topic "b:140112642:5" into qt-surfaceflinger-dev
am: 267b4c491a -s ours
am skip reason: change_id I6a05cd48d563a51d2ee38927c23d4946dd142f4b with SHA1 11b6a70c6f is in history

Change-Id: Ic1b6d57795e112dafff57ec3fa4e38f556811681