Merge "Revert "Fix code for more restrictive compiler [options]"" am: 4138eed6f4
am: ea213ab0d2

Change-Id: Id066ec453d869b538ffa2324e6ffbb28e3edbdeb