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

* commit '0015bf01804a81da198b9c3e0224f92a2b9d2c1a':

Change-Id: I155f336206c2cf42921e51a203ee94ea4739ec74