Merge branch '0.1.0'
am: 9e863545df

Change-Id: If3c68df0d7528382f640efc457e87b225f0cb726