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

Change-Id: I991e155b447f585c2fd423f91bb34187ed687485