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

Change-Id: I233006e5cf2a3967308591ba2231a745a0b64a3a