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

Change-Id: I9a71fe9006c946baac57af8e1b3984f655cdb62e