Merge cherrypicks of ['ag/20623016'] into sparse-9300911-L14200000957665628.

Change-Id: Ic6459ca64da904477651c8c64a3f07f9372534ff
tree: e117eb4ef21129ed090b60ca79004a6ac0c53fc0
  1. .prebuilt_info/
  2. 3/
  3. current/