[release] Prepare for next development iteration

Change-Id: I71e6793f29ac4c1702d66a57665b7a05dca27d5f
[release] 4.2.1

Change-Id: Id8a43fccb0c6f5cc704940e41b7e7f2ebfd9618f