Bump for 4.0-24

Change-Id: I439af02c4bbbd886260ec70234de38d4c3c8324c