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

Change-Id: I9551f23150868fa262f4f70fba3fe45ea5e21fb4