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

Change-Id: I1acede87cc726baf81bb0d970c0102efad2da107