Bump for 4.0-23

Change-Id: I94c69da37ac10e77aa28f503f7ae88c02783c5f9