[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: f68e6a03f1 -s ours am: c619ea83f6 am: 8b9ca1c96c

Change-Id: I91747ec5175ea6af1f80ddf7ff5da9e1b7be06ff