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

* commit '1d21aeca286cb3993ed758fd111a7d945687ed96':
  delete obsolete tips/references to cupcake