Merge changes from topic "am-f4ec2204-fd91-49e6-8328-41eaf99a20db" into ub-launcher3-master

* changes:
  [automerger] Fix @SuppressWarnings('deprecation') typo. am: 7927b03287
  Fix @SuppressWarnings('deprecation') typo.