Move some stuff to common again

Change-Id: I0d501d9bf9a8c1e8d7add8e1415599442c967149