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

Change-Id: Iba78e42da80de49c0f3631ff47bfb1ef4df6826f
tree: 496028255e370440d3dd0bb8fdf213f32c03e8e1
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS