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

Change-Id: I73fa86e0f6fe060da761f26d7f9e6751f91a1535