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

Change-Id: If6c4a71223223dcd79a50f71feb3ef471c4f5198
tree: f8c2c62094e102fa8e3922e1702a31fc35e0dcfb
  1. OWNERS
  2. scripts/