Prepare for next development iteration

Change-Id: Ie1bf1ce3c4c66a3f986600b91bef57ae71050b0d