[automerger skipped] Merge "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master" into stage-aosp-master am: 9963ba82ce -s ours

am skip reason: subject contains skip directive

Change-Id: Ie8f5c74071c42d4e70694eddf14f015151a2c34e