Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev
am: 641fbbd
* commit '641fbbd3f3ebfceff7c21ffd02defd580156ae1a':
Change-Id: I511bb6c0d77f37c55170444595d19ef66f628bed
This commit is contained in: