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

Change-Id: Ib4f7e0b7a11a5e8a1f440fe8729078b1820e7c14