Change-Id: I6780c7a17bab5b10ef3b979d00fce741d75427a3 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>