Prepare for next development iteration

Change-Id: I982127ad98a062100d73e2f61f94a162e88bfdfb