Merge cherrypicks of [19097922] into tm-release.

Change-Id: Icb0d32f00626b62e7fb7be99e86a6fe5563e2cde
tree: e059d6eb58e8b6397907895e706f2b29a05ce201
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS