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

Change-Id: I20c241df4a08dd0646c59a02958805973eefd27f