am 84206dab: Merge "Build fix" into ub-launcher3-burnaby

* commit '84206dab52b1244c8e1aac6905b0b5b33e89b5e0':
  Build fix