Update atom comments

Change-Id: I63d399462009bf0939d8a7d7af2ebfbe066bf90e
Merge "Update atom comments"