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

Change-Id: I616549336ae0603da8d28980116e5da8b487d134