Cherry-pick all changes from release-0.1 branch

Change-Id: I6063182a406903a2ee8c76e79ad2fa4d267b68ee