Update when to 3.1

Change-Id: Ib3abfce1ee0ce8552eee425b58d8cdc20a80f757