Merge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
am: 35fb3302d7

Change-Id: I94cfe913b3e66ce27a0ee7ea439d3ed6a77942f3