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

* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
  Remove code markers