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

Change-Id: I3c4bb00dbb02a7b6cab697b9391a97ea5a2bbb4e