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

Change-Id: I8fc7245e2a8e2c79f96e26ab4cf5a677c190bfc3