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

Change-Id: I7059f579c07e609c7101acb8b950787d694780e1