Removed some autogenerated comments

Change-Id: Ie8937e52a1fb72416626bcacd1fb672ba0f73ffd