[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d440aacd0d -s ours am: 1c9884ace4 am: a08edce81c

Change-Id: Id12eb091602d2ebf1a1ca4510bff7a17db1ec1ab