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

Change-Id: I798984ff3aa4bae44643f42416009bfcc9931bfd