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

Change-Id: I4b039a1dad3b050b17cc38811bf9a784eb746e37