Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
am: a666e34e65

Change-Id: If4df32998273717b3307eda2995052e785dc7154