cleanup some confusing comments

Change-Id: I21fe6fb2ea37a811f69278058277dd595866ae9b
8 files changed