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

Change-Id: I54af1835b167f1ed980b510e3acb11f26e39a5da