a766e6860a
The comments were entered into CL 682309, but implemented in this CL because of a change in branch. Change-Id: Ief5693b768890103fb48d9f377143002bd1a793d