Partial commit - will amend.

Change-Id: I7a8ae7a6e2471a9447e96557e808a7f8acf770e2