Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Replace ExpectedException with assertThrows

Change-Id: Ifde0515e354b2eeeece666da2ec6ac8cd857b33f