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

Ie01ee67eb8feccfb87577672f554cb19f7ed9bef

Change-Id: I3bfe9c23b2535661bfeff3aae739e140f9e8345f