Merge "Remove two unused event log tags." into honeycomb