Merge "Fixing Test builds" into ub-launcher3-burnaby-polish
am: f7f8cf5743

* commit 'f7f8cf5743810a614079ff7d4202dd0c9cd969ed':
  Fixing Test builds