Partial. will amend.

Change-Id: Ibf1695999fac55ab6818938c3092a0065efb7ff6