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

Change-Id: Idfb2e10771d121e3a072b00839e2e75594f38e21