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

Change-Id: I2ed66755997b4b7d943d9206264db158ee43c460