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

Change-Id: Ief1a2a709a2eb1eb2a682b2125ad25b371942715