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

Change-Id: Ic2c6709ff41ff312c92ded214e91b25bf1d5e28f