am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte

* commit '3fec14bedc03d77aa7a066a8053c6068dddda192':
  [DO NOT MERGE] fixing build break