Change-Id: I339e2e4f4f0ce52b1220745357170a457a14be35 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>