Merge "Adding additional instructions in default ringtone" am: d93e54742b am: a6cb130b67 am: 90999819c2

Change-Id: If71090a1ba52a07425ed892fbe743788a58c38d7