Fix merge errors from commit 22a8b59

Open-webOS-DCO-1.0-Signed-off-by: Janne Kiiski <janne.kiiski@lge.com>

Change-Id: I94b690cecb04c226c9c9c30d22b576c48ca48641