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

Change-Id: Ic859372f9562a9cc2fb91e1ccd42a19c8f882694