It should be separated at some point. Change-Id: I03adde303eed558d52e06f0afa673252e54c2182 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>