Change-Id: Ie24ff0d4b949ccb5cd21624e33ef2b42b6857743 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>