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

Change-Id: I632856f80c32c90ff4a79c2401539215a0f50187