Merge "Update counters for session encryption to start at 1." am: ae97b320d0 am: 61856cc926

Change-Id: I6ea839fbed2f7eea9804d4372ca05a411d233b6e