Namespaces, whitespace. Change-Id: I83df57b32a1a31b208181d65849688c09941a0be Reviewed-by: hjk <qthjk@ovi.com>