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

Change-Id: I4978ea01094640bbdd751787b0329f6dbcf44e30