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

Change-Id: I9be745838676fd95534048b5622783844d4c9b6a