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

Change-Id: I15bedf9d04650e1afcd35ed33bff83dedc1706b4