Prepare for next development iteration

Change-Id: Ib8e27ab29c2dc372bcbef968de8ed1688e39d614