DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 1f7a53d462

Change-Id: Ia0c45af54972f77c0c3efe2cb733e7b1e88f3df6