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

Change-Id: Ib681f518f589f8739ac7156ed8723d6f733d68a1