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

Change-Id: I959003dd4ad510fb5d8e7bb1b73979b11d518711