Easier to follow. Change-Id: I6da1ca862ddb7048a6d16bf5e6ea18d6b2cfc7f8 Reviewed-by: hjk <qthjk@ovi.com>