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

Change-Id: Ie88a7772bbb04399e4a72f692403de38c3c71639