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