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

Change-Id: Ia8f2e9ba8e1a244a2fc08b7225945480671f52ab