[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 47cee5adbd -s ours am: bd4ecc06b0 am: 7a05a3f0de

Change-Id: I78e585eb879c68d015412d14ea6ede191d744393