Prepare for next development iteration

Change-Id: I4ebf24fc6bb81652275fb08d5cd5b64e49614a0a