Merge 21ef4a64a07c64c079e5d82337bd2f49fe7da2f6 on remote branch

Change-Id: Ib7398eb9f04a2c1968d0d1855b50c9c2901283b3
tree: 580c2914b0561c1b2c40eb0c2f29163e9bd7bbb1
  1. scripts/
  2. OWNERS