Update CommonsMetadata for cherry-picks

Change-Id: I3ebb4a18af51d8b6abb8acc2bdad5a53e05eeeff