Initial upstream branch.

Change-Id: I1c718f3c3dbb526fecdd8903f0b2e6e16d71378e
Imported Upstream version 0.4.0