Rest of the incomplete conversion.

What I am doing today?! - sorry for the incomplete push.

Change-Id: Idca25b390820527481b1c672a0ad62f2d83a0e13