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