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

Change-Id: I64d5a976094612c6640a2c3a132f364b5c5be834