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

Change-Id: I7bc9b7c0e5d56f211c9703c47d3c6fb765e85e5b