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

Change-Id: I4de8f3902c46a5f5092198474e85457cfc7d5fb8