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

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