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

Change-Id: I60f987fe8f1362cddacccdaa32bb778029645934