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

Change-Id: Icfeff214fe1cdf5dae2694964cd65596cedebaf3