Prepare for next development iteration

Change-Id: I9b3bc6481e044e88a8e839b2c2418c28ec8c2255