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