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

Change-Id: I72852ad2f0d74de4d2de1783dd451d98f5854e87