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

Change-Id: I55a9a8a896c935ef7eba37cb21e9abf1f730e937