Merge cherrypicks of ['googleplex-android-review.googlesource.com/39271686', 'googleplex-android-review.googlesource.com/39271688'] into 26Q2-release.

Change-Id: I369447d7d3c3b75ed68b9ac16620141f849b9979
tree: f63b50185e4560d120df886d3e9e853474cc0570
  1. apex/
  2. tests/
  3. OWNERS