[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e7dbe95574 -s ours am: fdc3c68465 am: 5dffc15955

Change-Id: I06deafc41f03691b4beac6eaa0c33e8caea8949c