Prepare for next development iteration

Change-Id: Ie0aca12981e1215ebd61a761852c9ce13c3361d4