Initial commit. Second try.

Change-Id: I4599f4d2605eb106ef323abe5cf2ec262b03b67c