[release] Prepare for next development iteration

Change-Id: I0a995dca6b5fc4df103f2060e92739670efe02b8
[release] 4.2.1

Change-Id: I50a5a3736acc377d099ad5ce543593f8fd993603