upgrade to 0.6.16

Change-Id: Ibf7bb00c6fbc33f4bd65e36f55d8c8b1fd8f9a73