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

* commit '22790dfcfceebc537ffd3eb0a15fc0512f036091':
  Refactor the code.