am 14deca6d: am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev automerge: 2eaf0b0

* commit '14deca6ded51438439680eebf6d87f5191122e5b':
  Fix typo in activity_testing.jd