Prepare for next development iteration

Change-Id: If0324721e2898859b6c0ae6ff9704e41991a2985