Merge cherrypicks of [19099932] into tm-release.

Change-Id: I9e5005f0a75d62326df295d277d5c470cda7755a
tree: 8b052d37e724e0a2ee2a6394085a230c41b5a6c1
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS