Merge cherrypicks of [19246006] into tm-release.

Change-Id: Iffd4639946c8bf6bf8b6e2ec0465be1e59aeb379
tree: a9c7150312932d6041e4c4973b5e4299113211d3
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS