Merge e8f9418bb640d3c69e5806f054e1a33432155567 on remote branch

Change-Id: I9d132adb4d8d65dab91f180ee86f04be8ce61069
tree: 0b81271515941a6889d56908e1f14d1a9c67fa56
  1. OWNERS
  2. TEST_MAPPING