Change comments to avoid failures during test

Change-Id: I58f86077e347d6157bf37471c78a34e5a53807f6
Merge "Change comments to avoid failures during test"