[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 8bad3975e1 -s ours am: 76a3dadc8b am: 3fcd7e5196

Change-Id: Ibdbbed1e16f28dfc1065048397d6d3b4aac2f7c3