am e7b9e3c6: am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev

* commit 'e7b9e3c6a36f0f88b345204249c0848cc4cfb2d9':
  Add one more test and update old tests