Merge cherrypicks of ['googleplex-android-review.googlesource.com/27728969'] into sparse-11945331-L10500030004449972.
SPARSE_CHANGE: Ifb9689598031077c927c5910e1a6f04a6fddfc7d

Change-Id: Ie30ee8cb9898464d744b4a02dd658218195686ca
tree: 2f360c987b32c5ddebf09b2963c503f60d9fce06
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. OWNERS