[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 21095c0a13 -s ours am: 6a806bf542 am: cfcef3f0bb am: ccb46e1681 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia1b478be4e4fc1bf21efa1e8148a8ee6aed426bf