Merge 8cc0ce738bc3df42c35a9909475c90e3b74b7b87 on remote branch

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