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

Change-Id: I68c876385825bb3f17895de794d9ab81fde66b63