Fixed merge job breakage.

Change-Id: I981e5e70e8798492403ef14c9d7af091145765d0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Merge "Fixed merge job breakage."