[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 855e448024 -s ours am: b6d22b1cf7 am: 62dedcb519

Change-Id: I427abfe5f0aec6f418edcccc15f0e7f3d7f9bcb0