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

Change-Id: I5f0719d4b33af0767ac47afc39acc088b236e4a4