[automerger skipped] Fix missing endSession am: 524ff70a44 -s ours
am: aeb1814940 -s ours
am skip reason: change_id I77f0366f50bce772178b25ceadb3a0afe6a31b62 with SHA1 f5b8dd8392 is in history

Change-Id: Iafc91b501e3e3c2f4e04f41f3bae43829041ea5b