DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 26db848a52 Change-Id: Ib6c77292f616ce6939e8cbfae94db1c69f1f32ba