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

Change-Id: Ie2117f02ce5f9a289baea020d68ef073122ca0de