Break long lines and suppress false posive

Change-Id: I14c61d8060cd3a3a2a15193f6721e7f87b783538
Merge "Break long lines and suppress false posive"