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

Change-Id: I24a423f4df608a3029b62842aea7c8eb40a47a8b