Merge "Switch to exceptions for most cp calls" am: ece7e231a6
am: bc6c1ff8df

Change-Id: I7654daaedb0f23d8733f244782b9f74906cfee86