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

* commit 'bb64fe34ae6ecf0fafa74ddc4d416a21062dc516':

Change-Id: I36475216bbb46c474d1b693250d9392021a6903c