Partial commit - will amend.

Change-Id: Ibf984e0db7402dea5eccf5c6bfb57581c0920a53