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