Code comment followup to b096ffc70

Change-Id: I4844fe26f69782f97e29e6a03e5394586f7a8dfc
Merge "Code comment followup to b096ffc70"