Improve comments

Change-Id: I6d7d1e2418a475d2ab1a41fd0863e3415ab86f7c
Merge "Improve comments"