[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d am: 059c27ce5a am: 76f106a3f3 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib2159c9f03d4f0ecf77c48af476c78930b36792e