fix merge
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I9f79f7c823dbb109a8e6160c7649afe5123dda76