Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2
am: ab3721a

* commit 'ab3721ae74d5808ccffb713e256ac48abe895dba':

Change-Id: I37a1841fa7f51bd8ba58b866a8ee255a3aa15954