Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Replace ExpectedException with assertThrows Change-Id: I8ba9ecef9ad3d966fb400ebde9aa1db35e4d938c