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

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