Merge changes from topic "am-0ae90ad9-ce38-4d9c-a359-8fab89ef2835" into ub-launcher3-master

* changes:
  [automerger] Tune device profiles. am: 7e183c3976
  Tune device profiles.