Prepare for next development iteration

Change-Id: Ic1b5e2e5dd499be2fdca43c2f7172162b53f9a17