[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66ff678f17 -s ours am: c7a397e4d1 am: 31df5d3eac

Change-Id: Idcd4b3f80eab1c239bab931b2af8644afb00febd