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

Change-Id: I6aede28da98e91690da7f315c3b3d9002b09860b