am 7d6e54e4: am ccc10925: fix typo

Merge commit '7d6e54e49c43136aa34cc8806a954b22aa875f07'

* commit '7d6e54e49c43136aa34cc8806a954b22aa875f07':
  fix typo