am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"

* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
  Remove code markers