Cherry-pick following change-ids from release-0.2.

I155d42b0b45444fe239cb4ac9bd7e26e5c835aa5
Ie8559212b3850a191e61b7eace489ac369f7bfab
I42d3f577270c8330595c1e006e488c6fc4567d12
Ic75310c28e3d65e8871cc974699146c6767a4c6b
Ibf5ded656f7ae2c80e00aeb4c757bf238b7595aa

Change-Id: Ic260349de80e4ab92239c8eef8e492507bbc40e9