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

Change-Id: Ib0635eeb17975ebb192f1406f519da5f1d3a81ad