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

Change-Id: I282d1448af13372f0b3432ff4f93530ae2a531a5