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

Change-Id: Ib08f75fefe3d55241e81564a010597d31a82c1f4