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

Change-Id: I36aef947d9376f418666da14d7b9153092666039