Document and centralize the uses of undoing the helpid clear after
helpid->uniqueid hack

Change-Id: I4e651235407a0eca26dc0acfc089ef8f8ce57b13