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

Change-Id: I83882ea9d415ccb4c1a74b8dbfcf97bad12123d2