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

Change-Id: I858491c4fe5e97cd43d95d535f017122a1aa8616