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

Change-Id: Ia584ed311cffa0714558bf2181ed81f60189803f