Merge "Fix @Suppress annotation to be the kotlin style" into qt-dev
am: 9763648d04

Change-Id: I072428158cbadcc6ebf44341ecd3e2b5c93ffb07