Upgrading to when 3.1 -- tested without issue

Change-Id: Ic06d6dbe0b39805e5f11aa1568e9af58a9e1ccc2