Prepare for next development iteration

Change-Id: Ib053664902632540028138620bc4126e8423b152