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

Change-Id: I18dfc1cb95aaaea6c2daa49ee2cf07380d46dea6