Merge cherrypicks of [17804723] into sparse-8485989-L47100000954183944.

Change-Id: Id45f4aa4f510dd28737341be73e059bfc74a5d21