update to r3.1

Change-Id: I6cc86b57ec30ee3d3af28612184b7d1469f0b1b0