[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d411620d77 -s ours am: c8f5f4a140 am: 9b2cb81d71

Change-Id: I0c3d450e9f8e2c0559767a8a34c528212f355309