am 7a8227c4: Merge "Fix erroneous IllegalStateException." into lmp-dev

* commit '7a8227c4f6327388043f08237cbb2b233d5e7b96':
  Fix erroneous IllegalStateException.