DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: c2c2a13316

Change-Id: I9dfc699d221c900c3a80dfc9d691e74cb9f834ea