am 0b5d8511: Merge "Some code clean-up."

* commit '0b5d8511993145a9eeb978172944704dc621dbe9':
  Some code clean-up.