[automerger skipped] Merge changes from topic "b:140112642:4" into qt-surfaceflinger-dev
am: 3264ef9aa2 -s ours
am skip reason: change_id I72d8cd48b3ec900989afcf0fab1cdc3046b87274 with SHA1 ad083c40b7 is in history

Change-Id: I34425e7e74a815de9dc5992054efb007769363e6