Add comments and a missing @GuardedBy to static fields. Bug: 311377497 Test: N/A Change-Id: Iaa7835db36baece5b77c5a46419bbd9810e241b4