Merge "Clean up comment" am: 8cdc0da9ad
am: f1a2f4098b

Change-Id: I6a669438e5f1597d74c4411920084455c5e83931