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

Change-Id: Ic37cbefd11e80c33ecea51e1489711794510a9c1