Cherry-pick all changes from release-0.1

Change-Id: Iededda744c15bc1d584cc31581bd1456f15e79eb