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

Change-Id: Id28109048eae4c0746cc5d9aed0634ae5ba2d36f