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

Change-Id: Idf07e93051343f13c7e8abe59d2fc44f249b3a83