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

* commit '214cb0d489a82b6cbe8a7c5ce8efbb77e985c166':
  delete obsolete tips/references to cupcake