Merge "Unify assertThrows" am: a4091edc99
am: 3f21f94616

Change-Id: If349f647b34a71bc4eb1ba25ca18d543437eb969
tree: 7c43f2e5f6980f4a03c6a24abb0122dbe7b57c04
  1. core/
  2. services/
  3. tests/