am 246e9d50: am 9dc41d5d: Merge "Refactor the code."

* commit '246e9d502c67a501471399dd0c919884462fe011':
  Refactor the code.