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

Change-Id: I3a1d6dd3aefe1720f7b77174287357446626d1dd