[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b6e9695b8d -s ours am: c5cb3f0ec7

Change-Id: I3434abb73faf45ff85cee38839de4e9a3d0bee86