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

Change-Id: Ibf2f68e3b99ed7b5c48a3185991ece7a07f02a6b