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

Change-Id: I4ac47f8ce3f707852184a195e1915719ac76f7d1