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

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