[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2878f38f36
am: e7c9b74790 -s ours
am skip reason: subject contains skip directive

Change-Id: Iddd9eb9a8e6b6883208b6a13b24e43d323000526