Merge "Fix early session termination in FalsingManager" into nyc-dev
am: 39eb183

* commit '39eb1835b8588aa8dbaa6e0b6e528fa1f3db8bfe':
  Fix early session termination in FalsingManager

Change-Id: I9aaa97c37e501947dceb926f673a0b3c34a7f7ef