Merge "sonar fix - remove literal boolean true value"