am d4a3cae8: am 1df2557a: Merge "Remove code markers"

* commit 'd4a3cae8cc4cf924925ae57723e61c89f6c4fd51':
  Remove code markers