am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '4d28b813b64ccc215cd462de7f33455abbe04d0b':