[release] Prepare for next development iteration

Change-Id: I609472f6746b9b1de5f71038992a9b86c05957dc
[release] 4.2.1

Change-Id: I6141fc31294a77aacab5eebd6165fb0373a1c822