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

Change-Id: I65825d6fe83ffbdffb1e6c2093cbd1eb52f21f1f