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

Change-Id: Ica7554757d06b9f5ff92519a565381f7d6ce20cf