am 09a68ac9: am dbc51de4: am 53771e5f: Merge "Remove useless/repetitive code"

* commit '09a68ac943e0d21ad61a94ed4eac1d6099657602':
  Remove useless/repetitive code