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

Change-Id: I81128384a2161efd3714303d599bbb21c4eeb72c