1.24 -> 1.25

Change-Id: I7c970e44ad8086dbc2362f55548b16cfb32d3c2f
Merge "1.24 -> 1.25"