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

Change-Id: I43f72a5ce9cb640bf1870322df94993b07b8871e