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

Change-Id: I24ecd9f480b6423169bc2372a5b0503cbe9df69b