Merge "Adding catch for b/26221779"