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

Change-Id: I3ac49c5e0a1b4345ca0396d8a81829d6592e2d7f