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

Change-Id: I0e18c233a55a3cc601903ae01821b6a24edcd57d