Merge "Suppress warnings to compile with global -Werror." am: 251977ebbb am: a7c216da89
am: 583cbdd3ba

Change-Id: Idce0e224974ab122332951befd15972e1b2a166e