[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 16ae7719a9 -s ours am: c0b278b465 am: cb7542be7f

Change-Id: Idfd6b1f2b77abb29a8ae75083ebd97d3c7e4d9d2