This is a follow-up patch of be88027c
translating the remaing comments that were missed there.

Change-Id: I7866060ef6eec5f92751671bd4fc4bee64db149b