Fixed more warnings.

Change-Id: I2c230192669bf0d4f76aef7022595f3ece8b12e9
Merge topic 'fix_parallel_amrconnectivity' into next

c3ec35d Fixed more warnings.