am e6203a4d: Merge "Fix build" into ub-now-nova

* commit 'e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7':
  Fix build