Update comments

Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
7 files changed