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

Change-Id: I4be54c58c0eb4d26570653077d6c18da7ed83924