Merge "Unify assertThrows"
am: 978cca8972

Change-Id: I374d1fcc13d7b1f1411112ff664b1f283217fd60