Merge RP1A.200417.001

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