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