Merge "Fix code for more restrictive compiler [options] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572" am: 127f6303bd am: 7ca70d735d am: 2ea231fcde
am: a4c155438e  -s ours

Change-Id: I9f773698a10e8243d3597db1ad1d6eb7c47e6f40