Partial commit - will amend.

Change-Id: I154378f6ea8e591920f2a8c1262a73e85b8fd46a