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

Change-Id: Ida62cefaedee93cdd609bdb7722ecc6902fe94aa