Version updates for Cirrus

Change-Id: I7e91415e7781a60cd072c7bfc1f1a683979a300e
Merge "Version updates for Cirrus"