am 4a2828c6: Merge "Fix ActivityNotFound Exception in Dev Tools"

* commit '4a2828c6d29c47421473bdf671c67499130c1e02':
  Fix ActivityNotFound Exception in Dev Tools