Change-Id: I15c90e2e8befef5529b35fa02d3ca6d67a409cc7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>