Merge "EffectBundle: Fix sessionNo allocation" am: d264bb5314 am: 2fa808ebcf
am: e5615d99ef  -s ours

Change-Id: I4091ce4ea42243e1e051c469b8c7833bfbca11f2