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

Change-Id: Ibc06bd22657b622c398c70562014beabe9e103b6