[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 75854981f7 -s ours am: 37ec92182f am: 2133de2dd6

Change-Id: I0eeb3cc7cd9807476c8757e4886efa5cb53f9a46