Merge "Remove Obsolete Comment" am: e50c61c8ba am: 98e757472c am: 4fad31f698

Change-Id: Ic2b2ef9c107ae8f71040e50c6c2c9996eee4865f