Merge "EffectBundle: Fix sessionNo allocation"
am: d264bb5314

Change-Id: I7dc8f9bda583f97a79c96a77945d7879249e6306