Merge "Fix san-sangeles warnings with clang 3.1"