am 2e20ce35: Merge "Fix build warnings"

* commit '2e20ce35e8c6b9c5fb4d1d198ef5d801ded21064':
  Fix build warnings