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