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

Change-Id: If8e691042f2e090e16d6ae2cdbbb55115e5b5dc5
tree: 41fd12d2abf2fce4f3cc3eda9d3d8107910df7a5
  1. .prebuilt_info/
  2. 3/
  3. current/