Update comments

Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
7 files changed