[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 9b77cfa2be -s ours

am skip reason: subject contains skip directive

Change-Id: I9950442d8ac7e5bca5ce2cd9e3dd52e78a49e7b2