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

Change-Id: Ia9df283a1e363fad08c6e93dc5e5c5d5e5ff699a