Merge "Update the comments for all CellIdentity*." am: 2610ad0556
am: 4f95fd8532

Change-Id: I8ee47862cb6651baae20a79360f7c0c9a94137cc