Merge "Small fixes."
am: dfa0d1063a

* commit 'dfa0d1063a8b07c22d79116be799ffda537211e8':
  Small fixes.