am a9830d43: Merge "Fix build warnings"

* commit 'a9830d430ac36e22b53a1c2d405e4315396a8ab7':
  Fix build warnings