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

* commit '3f4d1bbddba1034af342a95b35a223615ad8bbbd':
  delete obsolete tips/references to cupcake