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