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

Change-Id: I9938dd21a8799c3b20c550f32994061a0f25b8eb