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

Change-Id: Icca848962da6b783fe83d0a9aab120e47527e45c