Prepare for next development iteration

Change-Id: I796b4e179127f41e078378472083321161606eea