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

Change-Id: I1f84c61f0b1d4d7c7468420de28f612d4f1f7460