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

Change-Id: I4c55f4e87863c98f4a5698a4d66c2ae85b28e923