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

Change-Id: Ib172852b14e5b9bd3140c7b4920a8e8ac08b8691