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

am skip reason: subject contains skip directive

Change-Id: Ic3372cb70b96739f96e4d0c224046ffdec26ba6a