upgrade to 0.9.9

Change-Id: I82c4e2ef2c57fb518c946ce017363937cbe0671f