Merge branch 'stable-3.8' into stable-3.9 * stable-3.8: Remove events from beforeStartupEventsQueue in-memory queue Change-Id: Ib9130c9b1e1c84b41d802a4525e428191e7a0848