Fixing merge typo

Looks like this somehow got omitted in one of
my previous rebases

Change-Id: I1f15804938b26cc0d2166574d039b31eaa2f4baa
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
1 file changed