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

Change-Id: I1c8dcfa9b32ccb963d8b60d7859968f16cc0a4bc