Merge changes from topics "input_events_id", "wire_input_event_id" into rvc-dev am: 0253cc8f2f

Change-Id: I5d31d5739114588ad183dfc28a0b061d154ecc60