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

Change-Id: I4dd0dae3b5e0c3c98a8f0fa106c25a435ad296cc