Merge cherrypicks of [20271308] into tm-qpr1-release.

Change-Id: I363d20f89cf0f199473965f72e1978e01f57d98c
tree: fadb5cfa01e81dfb014944b45acb448ab693e8ec
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS