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

Change-Id: Ia828f53c43d2228d132bb1136b46990eb3e8bc19