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

Change-Id: Id5f4ca1fb12275b84fe878d25718d7bdedcf4cec