am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '52a37bf8ab96c8ef897c4c35e33b4bbe6513de9f':
  delete obsolete tips/references to cupcake