Prepare for next development iteration

Change-Id: Ic601f754998008845fae0c87b6ef6f1624d6a49d