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

Change-Id: I423b121253f6c9c33f3f73d567bd57b84fa12f73