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

Change-Id: I5e9bb8e5056890954c905abdd3302414a959394b