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

Change-Id: I9c055b76a83959dc19ba915c6ad58f741f6eaa3f
tree: 3a59da4d0a2767b2506370862efb40c415317b94
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS