[automerger skipped] Merge changes from topic "b:140112642:1" into qt-surfaceflinger-dev
am: 7b6c15f85d -s ours
am skip reason: change_id If59bab3d40c783843f3c1d2312a5768a8af2b921 with SHA1 8444c3642b is in history

Change-Id: I60d831bcff88f35f8f8680a95ebdf91b127ea33f