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

Change-Id: I5f62246a1864f7ca2fddd92276a0e64d9d689cbb