Bump for 4.0-22

Change-Id: Ie1e528f6a203237818432b182da8e929ccf2e45e