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

Change-Id: I95b17102f3f8742fd98c0298a88b6d29421e527d