Merge "Updates for Play." into mnc-mr-docs