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