am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a':
  Remove 2 sub-tests from the internal test app.