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

* commit 'f4658e26cf77f16035415be30f0f2213ff6645f4':

Change-Id: Id94637e60d16461830d94930c04f88213e55658b