Merge "Unify assertThrows" am: 978cca8972
am: 3f21f94616

Change-Id: If349f647b34a71bc4eb1ba25ca18d543437eb969