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

Change-Id: I685a9099b49e7460568c4ceb275b805206d0248d