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

Change-Id: I387e199d1404f68e579f58ffade5517dd40d9e93