Partial commit - will amend.

Change-Id: I40b24d2d5308bbfaa627557e6b69053de9970153