Unfreeze and push to 3.1

Change-Id: Iac85009d6adfb8fbff93b9691ecc33af621c5246