Merge "Add a dummy entry for the 70220 event tag" am: 3152c540b4
am: 76b17047de

Change-Id: Id433f546af129b048f8db699d55c7ceaa747a0e5