upgrade to 0.6.18

Change-Id: Ifec81878bd40dbc4607fbd17232fff9934702d46