[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 38afee1136 -s ours am: 6a6934c810 am: 4c0200179c am: e7dd77c343 -s ours

am skip reason: subject contains skip directive

Change-Id: Iac7d9665a970a58df25ab15240cea7d36ccab6b4