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

am skip reason: subject contains skip directive

Change-Id: I5da450eff5f892f45c133edbe273e73a3f8818cc