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

Change-Id: I17e22bcef79894f7ba827eacbddf653f2d1ae2be