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

I15a1d146c9578972816d98fc28961fa94f34c904
Ifb57fb054d1c575404e1500e75fa417d3355bb7f
I4cca1440241b25787a7462bb46afc8ed83569d9a
Ib88a75629c8966e05baa25680d9e75e56d3378f8
I3ef7e32c4155e710278f2d12df03fe3cecc10a59
I9aa9b7323d0ab376ee5c509e9b03f2d889563631
Ie07aa62d26be5144cd61d45021c6e7f65244de26
I6c574c79a2950f852c0ad7db7f0c434878213a54
I5c8729c4c20ce9475ad1329ac13c1b08bda63bff
I7daeec2063f5b36c2e27b3f9e7db8c353f36e2c8
Id171e7d7dea916c8d3e506973d7294c38e0d1600

Change-Id: I92e77e604c39574dc10efe79a073c07daf53ee57