Merge cherrypicks of [19211511] into tm-release.

Change-Id: I5c0f2b782198eef8757fbb199955cd30ff2d174f
tree: b190df17899acf8ffcab15bc38de6601a272ad7f
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS