[automerger skipped] Merge "Add a dummy entry for the 70220 event tag" into pi-dev
am: c415debdbf  -s ours

Change-Id: I0f095831617c7a72cd4fd4e17df71e997c553b15