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

Change-Id: I0452cd302c57f4432fabd3297c6472533076e718