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

* commit 'a7dc9b9efa537a1ff7d21967ad828057588e6658':
  Fix erroneous IllegalStateException.