Correct warnings in Release mode.

Change-Id: If2be44fc0ca0048486421144d578df753c8246c2
Merge branch 'release_warnings'

Change-Id: I220014db8dfafaa37abce5c827a38f7a40ce6c6d