Prep for 4.2.4-snapshot

Change-Id: I3f9698c9861f2afa588c993d9448cf12a911c3e2