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

Change-Id: I0714154232ee0681a84947d57de51a2c092e1bfc
tree: 1c50d79936e66bfcbddd6ea44cd1ab076ac007cc
  1. .prebuilt_info/
  2. 3/
  3. current/