Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev