[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 08c3df80ef -s ours am: 3b5d8ae696

Change-Id: I905634a5f21079f04bf34c73eefe23d218ec760a