Cherry-pick all changes from release-0.1 branch

Change-Id: Ibd8bfcf199b07700226629fd5c0679669ea29578
Merge "Cherry-pick all changes from release-0.1 branch"