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

Change-Id: Ib9a3be79ee96d540156e0f487daf00e2941b842a