[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bbdf399346 -s ours am: e4e474780d am: 75e37c165d Change-Id: I8f96aa88a35f6672423cb22bc3b6f2b03930b4ea