upgrade to 0.6.16

Change-Id: I143bfd913daa0c1a3984e0e331c5be0f7de7e189