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

Change-Id: Ie01802dda7bc76d662fa1965c422d850794296a7