Merge "EffectBundle: Fix sessionNo allocation" am: d264bb5314
am: 2fa808ebcf

Change-Id: I856af81e1deeaa0f44d9778daefec8c258054f0a