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

Change-Id: I553c7cf114c6b880c7562173d91c27c808d362c5