Merge "Move common throws to ObjPtr" am: 968c14bd6f
am: 88f5dbbd54

Change-Id: I783538772670a939c4dccc16b73150008475ba49