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

Change-Id: I64ea167f68cd42c38fc3d12c8cdf5dd304e96869