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

Change-Id: I7f6f565db30c71de52c33122208a48a4c7edd6a5
tree: 53e984393b6d2004b5cf2ea203be7205e2e3b97f
  1. .prebuilt_info/
  2. 3/
  3. current/