upgrade to 0.8.5

Change-Id: Ia9b487bbe812c015b415536aaf282527e8000946