Merge "Remove Obsolete Comment"
am: e50c61c8ba

Change-Id: Iab08754ec05d74944451ec586beca0fe34582ce9